From 4f49eae7946e760b580b6cabd94cc75d816f39c0 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Tue, 25 Apr 2006 22:38:25 -0600 Subject: [PATCH] [IA64] Fixed "Oops: time tick before it's due" issue This patch fixed following issue, "Oops: time tick before it's due" in VTI-domain Signed-off-by: Anthony Xu --- xen/arch/ia64/vmx/vlsapic.c | 2 +- xen/arch/ia64/xen/xentime.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c index 2e4a3218af..a66e80c99c 100644 --- a/xen/arch/ia64/vmx/vlsapic.c +++ b/xen/arch/ia64/vmx/vlsapic.c @@ -121,7 +121,7 @@ void vtm_init(VCPU *vcpu) itc_freq = local_cpu_data->itc_freq; vtm->cfg_max_jump=itc_freq*MAX_JUMP_STEP/1000; vtm->cfg_min_grun=itc_freq*MIN_GUEST_RUNNING_TIME/1000; - init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, 0); + init_timer(&vtm->vtm_timer, vtm_timer_fn, vcpu, vcpu->processor); vtm_reset(vcpu); } diff --git a/xen/arch/ia64/xen/xentime.c b/xen/arch/ia64/xen/xentime.c index 96a5ca183d..5d83bf80d0 100644 --- a/xen/arch/ia64/xen/xentime.c +++ b/xen/arch/ia64/xen/xentime.c @@ -146,9 +146,9 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) * another CPU. We need to avoid to SMP race by acquiring the * xtime_lock. */ -#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN +//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN write_seqlock(&xtime_lock); -#endif +//#endif #ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN do_timer(regs); #endif @@ -159,9 +159,9 @@ xen_timer_interrupt (int irq, void *dev_id, struct pt_regs *regs) itc_at_irq = ia64_get_itc(); stime_irq += cycle_to_ns(itc_at_irq - old_itc); -#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN +//#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN write_sequnlock(&xtime_lock); -#endif +//#endif } else local_cpu_data->itm_next = new_itm; -- 2.30.2